From 468f9d21f4c98889209b63e822e07ac7d76dbf8e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 1 Sep 2012 15:23:50 +0300 Subject: [PATCH] Remove conflict markers and fix entries for revision 109836. --- src/ChangeLog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 92b55e5146d..7b88fb9674b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -37,7 +37,7 @@ * w32term.h (FRAME_X_WINDOW): Use FRAME_W32_WINDOW instead of directly accessing frame internals. - * w32font.h (w): Include font.h. Define syms_of_w32font and + * w32font.h: Include font.h. Define syms_of_w32font and globals_of_w32font. * process.c: Include TERM_HEADER instead of listing all possible @@ -80,15 +80,14 @@ * emacs.c: Include TERM_HEADER. - * dispnew.c (d): Include TERM_HEADER instead of listing all - possible window-system headers. + * dispnew.c: Include TERM_HEADER instead of listing all possible + window-system headers. - * ccl.h (c): Include character.h. + * ccl.h: Include character.h. * Makefile.in: Define WINDOW_SYSTEM_OBJ to hold objects needed for the current window system; include in list of objects to link into Emacs. ->>>>>>> MERGE-SOURCE 2012-08-31 Dmitry Antipov -- 2.30.2